Make tests self-hosting * Add wptserve as a submodule for serving HTTP files * Add pywebsocket as a submodule for websockets * Add a serve.py script that initalises the test environment with the servers running on free ports * Remove all PHP from the repository and replace it with wptserve-compatible python * Remove all .htaccess files from the repository and replace with .headers files * Some additional fixes to tests that were otherwise broken
diff --git a/XMLHttpRequest/send-authentication-basic-setrequestheader-existing-session.htm b/XMLHttpRequest/send-authentication-basic-setrequestheader-existing-session.htm index 414573e..00ce845 100644 --- a/XMLHttpRequest/send-authentication-basic-setrequestheader-existing-session.htm +++ b/XMLHttpRequest/send-authentication-basic-setrequestheader-existing-session.htm
@@ -4,6 +4,7 @@ <title>XMLHttpRequest: send() - "Basic" authenticated request using setRequestHeader() when there is an existing session</title> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> + <script src="/common/utils.js"></script> <!-- These spec references do not make much sense simply because the spec doesn't say very much about this.. --> <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="following::ol[1]/li[6]" /> <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." /> @@ -15,34 +16,36 @@ test.step(function() { var client = new XMLHttpRequest(), urlstart = location.host + location.pathname.replace(/\/[^\/]*$/, '/') - // Initial request: no information is known to the UA about whether resources/auth4/auth.php requires authentication, + // Initial request: no information is known to the UA about whether resources/auth4/auth.py requires authentication, // hence it first sends a normal request, gets a 401 response that will not be passed on to the JS, and sends a new // request with an Authorization header before returning // (Note: this test will only work as expected if run once per browsing session) - client.open("GET", location.protocol+'//'+urlstart + "resources/auth4/auth.php", false, 'open-user', 'open-pass') + var open_user = token() + client.open("GET", location.protocol+'//'+urlstart + "resources/auth4/auth.py", false, open_user, 'open-pass') + client.setRequestHeader('X-User', open_user) // initial request - this will get a 401 response and re-try with HTTP auth client.send(null) - assert_equals(client.responseText, 'open-user\nopen-pass') + assert_equals(client.responseText, open_user + '\nopen-pass') assert_equals(client.status, 200) assert_equals(client.getResponseHeader('x-challenge'), 'DID') // Another request, this time user,pass is omitted and an Authorization header set explicitly // Here the URL is known to require authentication (from the request above), and the UA has cached open-user:open-pass credentials // However, these session credentials should now be overridden by the setRequestHeader() call so the UA should immediately // send basic Authorization header with credentials user:pass. (This part is perhaps not well specified anywhere) - client.open("GET", location.protocol+'//'+urlstart + "resources/auth4/auth.php", true) - client.setRequestHeader("x-user", 'user') - client.setRequestHeader("x-pass", 'pass') - client.setRequestHeader('Authorization', 'Basic dXNlcjpwYXNz') + var user = token(); + client.open("GET", location.protocol+'//'+urlstart + "resources/auth4/auth.py", true) + client.setRequestHeader("x-user", user) + client.setRequestHeader('Authorization', 'Basic ' + btoa(user + ":pass")) client.onreadystatechange = function () { if (client.readyState < 4) {return} test.step( function () { - assert_equals(client.responseText, 'user\npass') + assert_equals(client.responseText, user + '\npass') assert_equals(client.status, 200) assert_equals(client.getResponseHeader('x-challenge'), 'DID-NOT') test.done() } ) } - client.send(null) + client.send(null) }) </script> <p>Note: this test will only work as expected once per browsing session. Restart browser to re-test.</p> 